pep8 it up and change file from dos (oops) to unix