Reorganised without inheritance 'more pythonesque?'