Cleaned up option parsing and CLI help text. Some minor formatting changes to follow PEP8.