PROBCORE-453 Cleaning up code + adding javadoc
Merge remote-tracking branch 'origin/develop' into develop