fix formatting + lint errors/warnings