refactored commas