Fix indentation, some formatting