Cleanup all code for consistency, and clarity.

Just trying to make it consistent with the rest of the code :smile:. Feel free to comment on what you don't like, or even reject the whole thing..