Pep 8 and code refactoring for all the remaining classes.