small rc refactor