Parameter refactory

thanks for the tips @giggio, new PR :)