I BELIEVE final modifications for PEP8 compliance