Make code a little less verbose. Also no need for rootlogon.C file now when invoking macro