STY: Better commenting