Clean up; add some content