Suggested code cleanup.