Fix linting issues and consistent indentation