Clean up Controller code.