Clean up the code

[copyme]

Code has to be cleaned up and commented.