refactored style pt2