tidy up some low hanging fruit