clean up and add final content