diff --git a/feature-toggle/pom.xml b/feature-toggle/pom.xml
index 9a2b04de3..c6dde055d 100644
--- a/feature-toggle/pom.xml
+++ b/feature-toggle/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>java-design-patterns</artifactId>
@@ -14,11 +14,11 @@
 
 
     <dependencies>
-    <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-</dependencies>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java
index e87983145..843ee173f 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java
@@ -5,6 +5,6 @@ import com.iluwatar.featuretoggle.user.User;
 
 public interface Service {
 
-    String getWelcomeMessage(User user);
+  String getWelcomeMessage(User user);
 
 }
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
index 16e7c5da7..8411339ef 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
@@ -6,13 +6,13 @@ import com.iluwatar.featuretoggle.user.UserGroup;
 
 public class TieredFeatureToggleVersion implements Service {
 
-    @Override
-    public String getWelcomeMessage(User user) {
-        if(UserGroup.isPaid(user)){
-            return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
-        }
-
-        return "I suppose you can use this software.";
+  @Override
+  public String getWelcomeMessage(User user) {
+    if (UserGroup.isPaid(user)) {
+      return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
     }
 
+    return "I suppose you can use this software.";
+  }
+
 }
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
index a712e4f02..732d06c61 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
@@ -2,13 +2,13 @@ package com.iluwatar.featuretoggle.user;
 
 public class User {
 
-    private String name;
+  private String name;
 
-    public User(String name) {
-        this.name = name;
-    }
+  public User(String name) {
+    this.name = name;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 }
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java
index 92b94f678..1328afbc8 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java
@@ -3,32 +3,43 @@ package com.iluwatar.featuretoggle.user;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Contains the lists of users of different groups paid and free
+ */
 public class UserGroup {
 
-    private static List<User> freeGroup = new ArrayList<>();
-    private static List<User> paidGroup = new ArrayList<>();
+  private static List<User> freeGroup = new ArrayList<>();
+  private static List<User> paidGroup = new ArrayList<>();
 
-    public static void addUserToFreeGroup(final User user){
-        if(paidGroup.contains(user)){
-            throw new IllegalArgumentException("User all ready member of paid group.");
-        }else{
-            if(!freeGroup.contains(user)){
-                freeGroup.add(user);
-            }
-        }
+  /**
+   *
+   * @param user {@link User} to be added to the free group
+   */
+  public static void addUserToFreeGroup(final User user) {
+    if (paidGroup.contains(user)) {
+      throw new IllegalArgumentException("User all ready member of paid group.");
+    } else {
+      if (!freeGroup.contains(user)) {
+        freeGroup.add(user);
+      }
     }
+  }
 
-    public static void addUserToPaidGroup(final User user){
-        if(freeGroup.contains(user)){
-            throw new IllegalArgumentException("User all ready member of free group.");
-        }else{
-            if(!paidGroup.contains(user)){
-                paidGroup.add(user);
-            }
-        }
+  /**
+   *
+   * @param user {@link User} to be added to the paid group
+   */
+  public static void addUserToPaidGroup(final User user) {
+    if (freeGroup.contains(user)) {
+      throw new IllegalArgumentException("User all ready member of free group.");
+    } else {
+      if (!paidGroup.contains(user)) {
+        paidGroup.add(user);
+      }
     }
+  }
 
-    public static boolean isPaid(User user) {
-        return paidGroup.contains(user);
-    }
+  public static boolean isPaid(User user) {
+    return paidGroup.contains(user);
+  }
 }
diff --git a/feature-toggle/src/main/test/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java b/feature-toggle/src/main/test/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java
index 66b6bfc41..bf9487a2d 100644
--- a/feature-toggle/src/main/test/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java
+++ b/feature-toggle/src/main/test/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java
@@ -6,31 +6,31 @@ import com.iluwatar.featuretoggle.user.UserGroup;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class TieredFeatureToggleVersionTest {
 
-    final User paidUser = new User("Jamie Coder");
-    final User freeUser = new User("Alan Defect");
-    final Service service = new TieredFeatureToggleVersion();
+  final User paidUser = new User("Jamie Coder");
+  final User freeUser = new User("Alan Defect");
+  final Service service = new TieredFeatureToggleVersion();
 
-    @Before
-    public void setUp() throws Exception {
-        UserGroup.addUserToPaidGroup(paidUser);
-        UserGroup.addUserToFreeGroup(freeUser);
-    }
+  @Before
+  public void setUp() throws Exception {
+    UserGroup.addUserToPaidGroup(paidUser);
+    UserGroup.addUserToFreeGroup(freeUser);
+  }
 
-    @Test
-    public void testGetWelcomeMessageForPaidUser() throws Exception {
-        final String welcomeMessage = service.getWelcomeMessage(paidUser);
-        final String expected = "You're amazing Jamie Coder. Thanks for paying for this awesome software.";
-        assertEquals(expected,welcomeMessage);
-    }
+  @Test
+  public void testGetWelcomeMessageForPaidUser() throws Exception {
+    final String welcomeMessage = service.getWelcomeMessage(paidUser);
+    final String expected = "You're amazing Jamie Coder. Thanks for paying for this awesome software.";
+    assertEquals(expected, welcomeMessage);
+  }
 
-    @Test
-    public void testGetWelcomeMessageForFreeUser() throws Exception {
-        final String welcomeMessage = service.getWelcomeMessage(freeUser);
-        final String expected = "I suppose you can use this software.";
-        assertEquals(expected,welcomeMessage);
-    }
+  @Test
+  public void testGetWelcomeMessageForFreeUser() throws Exception {
+    final String welcomeMessage = service.getWelcomeMessage(freeUser);
+    final String expected = "I suppose you can use this software.";
+    assertEquals(expected, welcomeMessage);
+  }
 }
\ No newline at end of file
diff --git a/feature-toggle/src/main/test/com/iluwatar/featuretoggle/user/UserGroupTest.java b/feature-toggle/src/main/test/com/iluwatar/featuretoggle/user/UserGroupTest.java
index 372e58c19..0b3ca6ba4 100644
--- a/feature-toggle/src/main/test/com/iluwatar/featuretoggle/user/UserGroupTest.java
+++ b/feature-toggle/src/main/test/com/iluwatar/featuretoggle/user/UserGroupTest.java
@@ -7,31 +7,31 @@ import static org.junit.Assert.assertTrue;
 
 public class UserGroupTest {
 
-    @Test
-    public void testAddUserToFreeGroup() throws Exception {
-        User user  = new User("Free User");
-        UserGroup.addUserToFreeGroup(user);
-        assertFalse(UserGroup.isPaid(user));
-    }
+  @Test
+  public void testAddUserToFreeGroup() throws Exception {
+    User user = new User("Free User");
+    UserGroup.addUserToFreeGroup(user);
+    assertFalse(UserGroup.isPaid(user));
+  }
 
-    @Test
-    public void testAddUserToPaidGroup() throws Exception {
-        User user  = new User("Paid User");
-        UserGroup.addUserToPaidGroup(user);
-        assertTrue(UserGroup.isPaid(user));
-    }
+  @Test
+  public void testAddUserToPaidGroup() throws Exception {
+    User user = new User("Paid User");
+    UserGroup.addUserToPaidGroup(user);
+    assertTrue(UserGroup.isPaid(user));
+  }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testAddUserToPaidWhenOnFree() throws Exception {
-        User user  = new User("Paid User");
-        UserGroup.addUserToFreeGroup(user);
-        UserGroup.addUserToPaidGroup(user);
-    }
+  @Test(expected = IllegalArgumentException.class)
+  public void testAddUserToPaidWhenOnFree() throws Exception {
+    User user = new User("Paid User");
+    UserGroup.addUserToFreeGroup(user);
+    UserGroup.addUserToPaidGroup(user);
+  }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testAddUserToFreeWhenOnPaid() throws Exception {
-        User user  = new User("Free User");
-        UserGroup.addUserToPaidGroup(user);
-        UserGroup.addUserToFreeGroup(user);
-    }
+  @Test(expected = IllegalArgumentException.class)
+  public void testAddUserToFreeWhenOnPaid() throws Exception {
+    User user = new User("Free User");
+    UserGroup.addUserToPaidGroup(user);
+    UserGroup.addUserToFreeGroup(user);
+  }
 }
\ No newline at end of file