minor refactorings

* remove unecessary params
* use object literals