Enhance the dispose pattern to erase Gendarme defects