Clean-up and typo in comments