Refactor to use initializer