Merged Constants & Messages. Code refactoring