build: refactored