lint and autoformat
manual formatting fixes