Removed redundant code. Builder pattern complete.