Refactoring - parameters moved to separate class passed as arguments to methods