Solving help dialog problem
Code cleaning