Cleanup, return and $scope, changed/fixed.