Seeing if we can make Vim and github agree....
Looks promising in terms of formatting consistency.
Just changing formatting and some imports.