Cleaning up code in Schedule.java