JBTM-589. Javadocs were added on static blocks and where possible field initialisations where removed from them