Clean up so comments