Minor Code Cleanup

- Changed constant names from camelCase to all UPPERCASE
- Simplified other code