Clean up some stuff around editing user
Merge pull request #30 from travisvalentine/cleanup

Clean up some stuff around editing user