formatting and linting fixes