Do not rely on order of object properties
Document phases
Tidy up