Clean up

A little spring cleaning to prep for making commands using MVVMLight
framework.