continue code cleanup