Performed some refactoring to prepare for Monday's demo.