Simplify and improve code.