PEP8 compliance / code cleanup