a little cleanup on fib code to ensure consistency... doesn't effect benchmark results
merge conflict resolved