diff --git a/cheat/cheatsheets/bzip2 b/cheat/cheatsheets/bzip2
index fe6935a..4003a50 100644
--- a/cheat/cheatsheets/bzip2
+++ b/cheat/cheatsheets/bzip2
@@ -2,7 +2,7 @@
 bzip2 -z foo
 
 # decompress foo.bz2 -> foo
-bzip2 -d foo.bz2 
+bzip2 -d foo.bz2
 
 # compress foo to stdout
 bzip2 -zc foo > foo.bz2
diff --git a/cheat/cheatsheets/diff b/cheat/cheatsheets/diff
index d8266e5..f998808 100644
--- a/cheat/cheatsheets/diff
+++ b/cheat/cheatsheets/diff
@@ -23,4 +23,4 @@ diff -s version1 version2
 diff <(command1) <(command2)
 
 # Generate a patch file from two files
-diff -Naur version1 version2 > version.patch
\ No newline at end of file
+diff -Naur version1 version2 > version.patch
diff --git a/cheat/cheatsheets/emacs b/cheat/cheatsheets/emacs
index c33889f..4201c0a 100644
--- a/cheat/cheatsheets/emacs
+++ b/cheat/cheatsheets/emacs
@@ -30,7 +30,7 @@
 
 # Other stuff
 
-  Open a shell         ALT-x shell
+  Open a shell         ALT-x eshell
   Goto a line number   ALT-x goto-line
   Word wrap            ALT-x toggle-word-wrap
   Spell checking       ALT-x flyspell-mode
diff --git a/cheat/cheatsheets/org-mode b/cheat/cheatsheets/org-mode
index fe47540..785cdb8 100644
--- a/cheat/cheatsheets/org-mode
+++ b/cheat/cheatsheets/org-mode
@@ -1,28 +1,28 @@
   Begin org-mode                               ALT-x org-mode
-  Save					       CTRL-x CTRL-s
+  Save                                         CTRL-x CTRL-s
   Export in other file formats (eg HTML,PDF)   CTRL-c CTRL-e
-  
+
 # Outline
 
   Section heading                              *
-  New headline				       ALT-return
-  Move headline up or down		       ALT-up_arrow/down_arrow
-  Adjust indent depth of headline	       ALT-left_arrow/right_arrow
+  New headline                                 ALT-return
+  Move headline up or down                     ALT-up_arrow/down_arrow
+  Adjust indent depth of headline              ALT-left_arrow/right_arrow
   Open/collapse section                        TAB
   Open/collapse All                            CTRL-TAB
 
 # To-Do Lists
 
-  Mark list item as TODO		       ** TODO
-  Cycle through workflow		       SHIFT-left_arrow/right_arrow
-  Show only outstanding TODO items	       CTRL-c CTRL-v
+  Mark list item as TODO                       ** TODO
+  Cycle through workflow                       SHIFT-left_arrow/right_arrow
+  Show only outstanding TODO                   items CTRL-c CTRL-v
 
 # Tables
 
   Table column separator                       Vertical/pipe character
   Reorganize table                             TAB
-  Move column				       ALT-left_arrow/right_arrow
-  Move row				       ALT-up_arrow/down_arrow
+  Move column                                  ALT-left_arrow/right_arrow
+  Move row                                     ALT-up_arrow/down_arrow
 
 # Styles
 
@@ -35,7 +35,7 @@
 
 # Heading
 
-  Header				       -*- mode: org -*-
+  Header         -*- mode: org -*-
 
 # .emacs
 
diff --git a/cheat/cheatsheets/xmlto b/cheat/cheatsheets/xmlto
index 6b087c0..51a67f0 100644
--- a/cheat/cheatsheets/xmlto
+++ b/cheat/cheatsheets/xmlto
@@ -12,4 +12,3 @@ xmlto -m ulink.xsl pdf mydoc.xml
 
 # use non-default xsl
 xmlto -x mystylesheet.xsl pdf mydoc.xml
-