tidy ups
less chatty