Documentation, separation of concerns, functionality moving around