Dispatcher updated, code beautify, PHPCS 100%