holoirc: follow lint recommendations and cleanup code