Are you sure?  I've avoided refactoring the existing code where possible, as it doesn't have anything to do with this pull and makes review more difficult.  I will if you insist.