Spruce up constructors