Try to comply to PEP8

Will try to re-organise the code later