diff --git a/Sorts/SelectionSort.java b/Sorts/SelectionSort.java
index 21fa7151..bc0201ce 100644
--- a/Sorts/SelectionSort.java
+++ b/Sorts/SelectionSort.java
@@ -1,73 +1,60 @@
+package Sorts;
+
+import static Sorts.SortUtils.*;
+
 /**
  *
  * @author Varun Upadhyay (https://github.com/varunu28)
  *
  */
 
-public class SelectionSort {
+public class SelectionSort implements SortAlgorithm {
 
     /**
      * This method implements the Generic Selection Sort
      *
      * @param arr The array to be sorted
-     * @param n The count of total number of elements in array
      * Sorts the array in increasing order
      **/
-
-    public static <T extends Comparable<T>> void SS(T[] arr, int n) {
-
-        for (int i=0;i<n-1;i++) {
-
+    @Override
+    public <T extends Comparable<T>> T[] sort(T[] arr) {
+        int n = arr.length;
+        for (int i = 0; i < n - 1; i++) {
             // Initial index of min
             int min = i;
 
-            for (int j=i+1;j<n;j++) {
-                if (arr[j].compareTo(arr[min]) < 0) {
+            for (int j = i +1 ; j < n; j++) {
+                if (less(arr[j], arr[min])) {
                     min = j;
                 }
             }
 
             // Swapping if index of min is changed
             if (min != i) {
-                T temp = arr[i];
-                arr[i] = arr[min];
-                arr[min] = temp;
+                swap(arr, i , min);
             }
         }
+
+        return arr;
     }
 
     // Driver Program
     public static void main(String[] args) {
 
-        // Integer Input
-        int[] arr1 = {4,23,6,78,1,54,231,9,12};
-        int n = arr1.length;
+        Integer[] arr = {4, 23, 6, 78, 1, 54, 231, 9, 12};
 
-        Integer[] array = new Integer[n];
-        for (int i=0;i<n;i++) {
-            array[i] = arr1[i];
-        }
+        SelectionSort selectionSort = new SelectionSort();
 
-        SS(array, n);
+        Integer[] sorted = selectionSort.sort(arr);
 
         // Output => 1	  4	 6	9	12	23	54	78	231
-        for(int i=0; i<n; i++)
-        {
-            System.out.print(array[i]+"\t");
-        }
-
-        System.out.println();
+        print(sorted);
 
         // String Input
-        String[] array1 = {"c", "a", "e", "b","d"};
-        n = array1.length;
-
-        SS(array1, n);
+        String[] strings = {"c", "a", "e", "b","d"};
+        String[] sortedStrings = selectionSort.sort(strings);
 
         //Output => a	b	 c  d	e
-        for(int i=0; i<n; i++)
-        {
-            System.out.print(array1[i]+"\t");
-        }
+        print(sortedStrings);
     }
 }