[Minor] code cleanup
- extracted constants for configuration
- fixed redundant null check
- cleaned up compiler warnings on i18n