Refactoring & changed Yahoo quotes loading