Mainly Javadoc
Mainly Javadoc + cosmetic changes