Updated Model - javadoc and cleanup