Cleaning

Tidied things up, adhering (loosely) to PEP-8