Working parsing of rubrics and cleanup/refactoring for cleanliness