Refactored and changed formatting in RCC