Fix indentation, cleanup