Refactoring prior to turn in.