Code inspection : Fixing PEP8 and Comments (+2 TODO)