Performed more code cleanup.