tidy up a bit
fixes