Separate logic of parameters and setup a little