minor style changes
adjustment of some hooks