Improved comments in dispatcher class