Remove blank line and trailing comma