Minor formatting changes, and fixed dead store