Clean up write logic and clone reporting