EHash code cleaned