Cleanup & Fix typo