Refactor La grammar