Cleanup commits

Some clean-up, also check out pylint to conform with coding standards.