Kill whitespace
Remove dead file
Renaming
Delete dead code
Move presentation logic out of main