Tidied up dialog creation interfaces and comments