Fix method complexity and variable length