Modify indentation, small cleanups