Refactored some more classes to pylint standards.