Mainly Javadoc + cosmetic changes