CGIV-2481 bit of tidy up