build: minor refactoring