Cleaning up more code in schedule.java