#16 Typo and improve readability