simplify and fix bower