remove es6 shim
add lexer class comments