Clean up whitespace and indentation a bit