Reorgranized fullexpand to smaller function blocks