cleanup according to Landscape.io and PEP8