Cleaned code in cloned