Cleanup Scalar a bit