cleanup and name