Bower cleanup

Does this look good? Please merge if so!