Did code cleanup