rc-dev: fix code-style issues