1) Cleaned up Controller.java slightly (formatting, comments)