Cleaning/removing unnecessary commenting