Smoother code