Fix spelling mistake and tidy comments