more cleanups for style, fix header block