Code cleanup as per PEP8