Add RFC format and some edits