Refactor: extract building method to class Builder