Tidy the Build