Updated format & various edits