Refactor strings and comments
Fix dialog leaking