Edit and some formatting