refactoring base.py :)