refactor code for name coversation and style