Reserve more keywords and improve pretty print