come code cleanup