Refactored dinodex based on Franco's comments

Same with weight_limit