Making outwriter private since it's only used by the builder
Refactoring file sanitization to be a little cleaner
Making the linter happy
Fixing fmt
Merge pull request #10 from sylphon/shoring-up-some-other-things

Shoring up some other things