Switched to using constructor initializers