tidy and fix