Typo's and cleanup