holoirc: minor refactoring and fix reported issues