Indexed and cleaned up