Minor formatting changes

Cleaned up code a little.