Moved labels to variables

These variables should always have values associated with them.