cleaning & commenting