Refactored to remove ambiguity, constructor was doing non-init work