Refactoring intents and constants.