Overall cleaning and standardization of formats
Add reference, plus small edits