Cleaned up smoothing

long overdue cleanup