Cleaned up a few things.

Far from perfect, but functional and demonstrative of our protocol.