restructure and tidy.