Classification code cleanup