Slight cleanup/minor language changes for /hat