Change OTHER and IDLE index, plus some cleanup