Rework some comments