Recommitting changes for code cleanup