Update code cleanup