this.super + comments + cleanup