holoirc: cleanup and minor refactoring