Final refactoring of college project code.