Refactor to use constructor pattern.