Cascade module: code cleaning