Pushing code cleanup changes