Bit of tidy up required as logging too verbose