Cleanup comments again