Clean + move to angularjs 1.3