Write refactor

Do your thing, Travis!