Basic cleanup and typo correction