Further refactoring for coding standards.
Fixed references to dialog properties in specification.