Clean build sequence and give methods less responsibility