Did a code cleanup