Clearer way to inject $scope etc