Cleaning/commenting part 2.