Removed debugging code.
Modified to use strategy logging methods.
Moved dispatcher to a separate file.