Refactor for build helpers
Played with component build