X15 Hashing Refactored