Ran code cleanup