Changed constant names from camelCase to all UPPERCASE
Cleaned up code
Merge pull request #91 from jeffreywix/CodeCleanup

Minor Code Cleanup