branch: refactor width computation