ruff

56e55017 - addressing some of Micha's comments