Enhance options, more concise and flexible
make comments clearer