moving stuff into DefintionFetcher class
moved definition fetcher into seperate class