Code review fixes:
- Constants moved to appropriate classes