Minor formatting changes and stuff.