clean up a few niggly bits