Improve comments and maximum 80 characters in each line