Refactor to made more angular.