Clean up and indention.