Edit formatting and naming