Comment and cleanup code

[lgodier]

Hello, In this very small PR I commented all my work. Also applied TA's comments on the code structure. Nothing much was changed :)