[ZDWB-79] Addd Javadocs and some minor clean-up.