PEP8, doctoring, and variable name changes
Fix issue 3 and 5
Merge branch 'delta'