Simplify and format