Refactor out constructor.name