Reafactoring of bower code