Re-ordering comments and fixing PEP8