Fix stylistic issues found by kibit