clean up code

[gdoenlen]

There's a lot of hard coded strings and just plain ugliness from the original author this was forked from.
We should clean it up to make the code more readable.