safe

Safe refactoring: Removing object initializer, introducing builder
· coding refactoring safe