[SJIS] Cleanup bad logic, and better readibility