rename and cleanups