Minor alterations made as I read on in AngularJS, mostly based on hunches