code cleanup according to PEP8