Fix some lint issues, reindent.