Indentation, minor changes