Release 0.11.15: Remove unnecesary array and better lex