Clean up Dispatcher.initialize
Update specs