Refactoring to support variable names with spaces.