- Change code to be more "pythonic" style..
 - Cleanup
 - Fix pep8 issues by autopep8