common: refactor in progress