Simplify and improve.