Cleanup of function splitter logic, some comments and fixed branch delay size estimation