cleanup of name code