[refact] make scope more obvious