Cleaned up code

Removed unnecessary code, replaced spaces by tabs (less file size and
better readability) and some syntax improvements...