Cleaning up a little bit (Angular)