Refactored map variables.