Reformat for VIM and Lint