mostly formatting tidy