removed underscore dependency
cleaned up indicators for #161