fix indentation, add comments