Clean up code format a bit.