Tidy up those inconsistent hashes man