Adds slightly more code cleanup.