core.py: one more change concerning default arguments
cleanup code