Style changes and double commas elimination