Some simple code cleanup.