Fix dispatcher code to remove unneeded wait()

Fix dispatcher code to remove unneeded wait()
Small code beautifications

refs http://teampulse.telerik.com/view#item/274546