Setting up javadocs and cleaning up ApplicationStateModel