Further pep8 improvements
Add some doc strings
PEP8-ify options parsing