refactoring: add/rename parameters