Refactoring and comments; Add a rule for "ư"