Beautified code.

Partially fixed #4. This should make the code a lot more readable.