Making tidy the Enterprise Guide