Update javadoc
Update javadoc
Extract inner class to its own proper class
Change static field scope back to public (too many dependencies right
now)