add default params
code cleanup