further style changes, minor