making changes so that the code fits the 88 line length and ruff formatting rules