Refs #39: feedback parser (wip), refactoring