Moved the "constants" into the main namespace.

Removed some not necessary comments.