bunch of boring formatting changes; no new functionality