make all values of hash be variables rather than function calls
fix syntax, having been confused by massively long lines