Build: We changed trees, also some format cleanup