holoirc: cleanup and refactor