rc-dev: minor refactor