stylistics and functions changes