Update to use Maven Annotations

Unindent?