refactoring/comments on setup dialog