small code refactoring

to make default options more readable and fix some function
naming to better reflect its function