Cleaned up fib method code