model/rubric: Bug fix & cleanup