Tidy and fix