Intro to Java Homework - Refactoring