Cleaned up comments and removed unused code

- aligned comments differently
- deleted unused code to display the current username
- removed some spaces