Made constructor parameter order consistent