style update; fixed order loop