tidying stuff up a bit