ran code through formatter/linter to avoid merge conflicts