Refactor out instance variable builder