Updated content, improve formatting