Refactor Fibo