Clean code more, plus ANOTHER TYPO BUG