optimize angular index
concurrent maps created via factory
cleanup