refactoring, bower improved usage