Tidy some stuff up