Small comments cleanup