More simple & clear

Just remove local option routines, call the lib routines is more simple & clear