cleaned up as I understand eve/angular a bit better.