used pyCharm to clean up the code
Merge pull request #1 from deadfalkon/master

used pyCharm to clean up the code