clean up & rename