NO-ISSUE:

. Added some missing javadocs
. Small refactor around constants