Tidying up Controller code.