PEP8 and minor coametic changes