Hotfix/create definition from config optimisation

Hi Phil.
I've tried to simplify the createDefinitionFromConfig() method by moving the logic for resolving the concrete class into its own method.
I've run it through Scrutinizer and it's coming out with a better mark than before, but let me know what you think.
Thanks.