tidying some stuff up