Add uninstall section to Makefile and several code cleanups

The Makefile was lacking an **uninstall** section, so I quickly added it.

I also cleaned up the code. I removed whitespaces and when an **if** statement has only one line of code I removed the brackets around it. Mainly a style thing, though.