Whitespace cleanups

* Removed unnecessary blank lines
* Removed trailing whitespace
* Fixed indentation

Part of #50
print cleanups

Minor adjustment to reduce problems when migrating to print as function.

Part of #50
if conditions cleanups

Part of #50
Cleanup: Just pass the integers to sys.exit()
Cleanup: Use property

Part of #50
Cleanup: Use property again

Part of #50
Cleanup: Cleaner way to create the dictionaries