cleanup rc code a little bit