improved "introduce layering", removed TODO in index