CR changes: wrapped "constants" into an object so they have better context
CR changes: docs clean up