Simplier code