Code refactoring for required asterisk mark