Cleaning + A bit of code.

Note to self : I am so damn slow. Will continue later or tomorrow