[ET/PS] refactor