Revise and simplify.