Doing code cleanup.