Simplification and tidy-up