some tidying changes