Refactor PKEK2 related functions