Fix Albert's comments