Format code according to PEP8 and other little changes