a bit of a tidyup, i guess