Cleaned up a few files in order to follow PEP8 standard