Simplify & speedup.