Cleanup, don't use mux or to, improve persist, use names.

(taking @progrium's comments to heart here)

Signed-off-by: Robert Xu <robxu9@gmail.com>