Minor code cleanup and version bump

The repo was created and a release version was published, but the SNAPSHOT version was not increased. So increase the snapshot version so newly added content will show up as part of a newly published release version.

There is a case where a method visibility needs to be increased from private to public to avoid a code warning.

There is a case where logic has been moved to another class but the original logic was not updated to use the new method.