Cleaned up - nice shape.