Slight refactor of the returns from the fibs function to reduce complexity.  Closes #1.