Views and controllers tidy-up