(maint) Change version to 0.9.4-SNAPSHOT and cleanup

Prior to this commit, there was some general cleanup that was required.
Methods that were only used in this file were changed to private and the
javadocs were cleaned up. Also the version changed to 0.9.4-SNAPSHOT