Re-ordered initialization list parameters to match class definition (avoid warnings)