Simplify and revamp.