Comments added and indentation increased