rc: Refactors for the finish