Tidying up get/set