Cleaned up smoothing