Minor code cleanup
More cleanup
Merge pull request #1 from fcrepo4/CodeCleanup

Minor code cleanup