Added gffi to the list of used packages and cleaned up