Cleaning Code / Comments, Transition work in progress