Reorganizing some of the Scalar declarations