cleanup and rename