moved Options functions into Salt, because that's the only file that uses them