Change variable names in interactive mode and tests mode to make clearer
Shortened interactive mode program