Attrib

This is more of a style cleanup in the sub directory.  The changes I made in some other sub directories have more meaningful stuff, but I did clean things up as I scanned through various files.
Same comment throughout this code review.