ENGINE-714: Javadoc

Fixed Javadocs and clean some code