Continued refactoring
Completed refactoring, streamlined some methods.