minor formatting changes / file cleanup