modernize codes / deprecate indexing shortcuts