[enhancement] Cleaning and commenting