rc-dev: style refactor