cleaning & commenting + overrides