sanitize some code
move constants around
Merge pull request #1 from eugene-eeo/sanitize-code

Sanitize code