some style reworks