tidying some things up