simplifying code
modified name entry