Refactor for more easy bower use