Clean up the code

[boyeln]

The code is a bit messy. Defining standards and cleaning up the code is probably a good idea.