PEP-8 fixes for tool related stuff.
More testing for parameter parsing.