Updated to constructor to "proper" syntax