rc-dev: resolve code-style issues