Removed debugging code and fixed some PEP-8 fail