Sorting out some code issues

Trying to optimise the code a bit by getting rid of un-necessary string
variables.  Instead of declating a string and then assigning var->alias
to it, I am using var->alias by itself.