Some cleanup in Controller.java