tidyed stuff up