File cleanup

Some of these changes are a bit pedantic -- don't hate me ;)

I'm hoping this can lay a foundation for a larger cleanup/refactor effort.