Updated to better respect PEP8 guidelines