CS fixes

- Remove extra alignment spaces after commas