Fix typo and split long code line