Javadoc + like cycle management
Mainly Javadoc + cosmetic changes