Improve comments and indentation