cleaner architecture in cleaninfinity.py