Added name identifier back in. Also, removed a useless comment.