Typo and code cleaning