more formatting changes and cleanup