refactoring grace notes