Update to use Maven Annotations

I can fix that.  Project is using mixed tab/spacing in a lot of places.  Maybe a fix up to make that consistent.  It seems tabs is the norm on this project, how about I just convert it all to be tabs?  I had tab'd this one but it was surrounded by spaces.