Cleanup & typo correction