lineup-parameters: some code clean-up