refactoring repositories to simplify template methods now that the parsers have been refactored.