Cleaning up Annotation model and adding Javadoc comments