cleaning up classes adjusting method names, changing rigid strategy setting to dynamic setting