Clean code and remove comment.