Re-formating everything. Make clear what's notes.