First draft of LL(k) grammar + small visual improvment