More alphabet and refactor