tidying things up a bit
link here, too