Tidying up ModelAdminController, Model and Validator classes