fix and tidy.