Refactoring: Removed big configration object