modify option and some clean up