insignificant comment and code style cleanups