Refactor linq, fix bower and gulp file