Tweak delimiting
Tweak naming
Refactor magic hashing