tweaked c++ style, also attribute-list fixed when minor modes exist