Cleanup, javadocs and tighten up visibility