Removed some duplication/dead code.
Fixing indention - sticking with spaces for indention and not tabs.