Refactor building method