Update generator to make single-line params and remove apis first