Updated for pep8.exe and Ram style feedback