Remove the extraneous and add the details