Updated code to 100% PEP8 compliance