fixed order of constructor arguments, removed type parameter