* Update rc, clean code