Dialog changes, code cleaning.