Fix indentation, formatting