Fix linting/formatting errors