Clean Up Constructors

Move logic out of constructor to helper method. Should help make the
logic easier to follow.