Add blank lines for readability

This change removes trailing commas also.