Delay module + code cleaning