Refactor code. Add #display_name