Fix indentation, add brackets when needs and change some text