Swapped hardcoded strings with reference to values