Continued cleanup, commenting and refactoring.