Simplify and polish