Cleaned up and made PEP8 qualified file