Improved commas and consistency