Clean-up: PEP8 and nicer formatting