made refactoring in Params object