Cleaning up ProductFetcher class

cleaning and performing some optimizations