PEP 8 corrections and removing print statements