Add parenthesis for consistancy
Move shared constants to module
Merge pull request #93 from jho406/develop/jh-cleanup

Develop/jh cleanup