Removing extra classes. Using a more appropriate setup for angular.