further style changes, some minor re-org