Improve overall pm module style