Nicer list syntax
reorder keywords