Cleanup more comments