Less manual editing