cleaning up and changing name