Modified code to use consistent style for ctors