mostly code styling changes, linting