Update indent and add some keywords