cleanup: reduced scope and moved constants to .cc file
Merge pull request #27 from ralphtheninja/master

cleanup: reduced scope and moved constants to .cc file