Minor cleanup of JavaDoc
Added static halper methods