Clean up indentation, code-formatting