[Task] Clean up

[chriscoderdr]

We are working so fast that we are foregoing the code styling we ourself defined at the beginning of the project, let start to clean up the project.