Few bits of tidy up