Fix formatting, using PEP8
Better cleanup