Continued making some refactoring changes, project is mostly clean.