diff --git a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
index fcdedef64b5295b817249b1aa45408d8c1867d5b..19a3e812979c11361925859bad996ef1734068bc 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
@@ -103,7 +103,7 @@ public class MainManager {
         lastCommands.add(input);
         lastCommandIndex = lastCommands.size() - 1;
 
-        input = Tuils.trimSpaces(input);
+        input = input.trim();
         input = Tuils.removeUnncesarySpaces(input);
 
         for (CmdTrigger trigger : triggers) {
diff --git a/app/src/main/java/ohi/andre/consolelauncher/commands/CommandTuils.java b/app/src/main/java/ohi/andre/consolelauncher/commands/CommandTuils.java
index abef741f0ed716edf72b1bdc359dc7bd24bccf01..7156419e8bc21ebe2e32630610129a4bc08618e0 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/commands/CommandTuils.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/commands/CommandTuils.java
@@ -53,7 +53,7 @@ public class CommandTuils {
 
         if (types != null) {
             for (int type : types) {
-                input = Tuils.trimSpaces(input);
+                input = input.trim();
                 if (input.length() <= 0)
                     break;
 
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java
index 13dc8fe294ef9ce4c7b9eeadd436e3cc3fae28f5..063b09d89776017cf2ea6fe35f82c04d473f339c 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/managers/PreferencesManager.java
@@ -18,7 +18,7 @@ public class PreferencesManager {
 
     public static final String SETTINGS_FILENAME = "settings.txt";
     public static final int SETTINGS = 10;
-    //	  skin values
+
     public static final String DEVICE = "deviceColor";
     public static final String INPUT = "inputColor";
     public static final String OUTPUT = "outputColor";
@@ -36,13 +36,13 @@ public class PreferencesManager {
     public static final String SUGGESTION_BG = "suggestionBg";
     public static final String SUGGESTION_COLOR = "suggestionColor";
     public static final String TRANSPARENT_SUGGESTIONS = "transparentSuggestions";
-    //	  other values
+
     public static final String DOUBLETAP = "closeOnDbTap";
     public static final String SHOWSUGGESTIONS = "showSuggestions";
-    //	  music values
+
     public static final String PLAY_RANDOM = "playRandom";
     public static final String SONGSFOLDER = "songsFolder";
-    //	  preload values
+
     public static final String USE_SYSTEMWP = "useSystemWallpaper";
     public static final String FULLSCREEN = "fullscreen";
     public static final String NOTIFICATION = "keepAliveWithNotification";
@@ -51,7 +51,6 @@ public class PreferencesManager {
     public static final String ALIAS_FILENAME = "alias.txt";
     public static final int ALIAS = 11;
 
-    //    settings version
     private static final String SETTINGS_VERSION = "settingsVersion";
     private List<String> settings;
     private List<String> aliases;
@@ -84,7 +83,7 @@ public class PreferencesManager {
                 if (n != ALIAS)
                     line = line.replaceAll("\\s+", "");
                 else
-                    line = Tuils.trimSpaces(line);
+                    line = line.trim();
                 list.add(line);
             }
 
diff --git a/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java b/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java
index 4b50f036efa414b0eaf328c7553c30375c1b47cb..fbbf67c5c64a0877839569cc274bd4e951d95e02 100644
--- a/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/TerminalAdapter.java
@@ -63,7 +63,8 @@ public class TerminalAdapter {
 
     private OnNewInputListener mInputListener;
 
-    public TerminalAdapter(TextView terminalView, EditText inputView, TextView prefixView, TextView submitView, SkinManager skinManager, String hint) {
+    public TerminalAdapter(TextView terminalView, EditText inputView, TextView prefixView, TextView submitView, SkinManager skinManager,
+                           String hint) {
         if (terminalView == null || inputView == null || prefixView == null || skinManager == null)
             throw new UnsupportedOperationException();
 
@@ -169,7 +170,9 @@ public class TerminalAdapter {
                     public void run() {
                         mTerminalView.setText(Tuils.EMPTYSTRING);
                         for(CharSequence sequence : newText) {
+                            sequence = Tuils.trimWhitespaces(sequence);
                             if(isInput(sequence)) {
+                                mTerminalView.append(Tuils.NEWLINE);
                                 mTerminalView.append(getSpannable(sequence.toString(), INPUT));
                                 mTerminalView.append(Tuils.NEWLINE);
                             } else {