Simplify and improve style