Some refactoring for bower