Reformat for VIM and lint