Refactoring and trying to tune the creational parameters