rc-dev: internal refactor