Formatting & Minor edits