Some refactoring and adding limit to faresStream