Nonfunctional changes to remove compiler warnings and clean syntax.

Nonfunctional changes to remove compiler warnings and clean syntax.

https://jira.duraspace.org/browse/FCREPO-1262