fixed indentation, etc