add some more javadoc
Little bit of code prettification