annotate model classes
cleanup