Reached PEP8 compliance... hopefully! :)