Clean up python code (using default value for parameters => permit to remove one function)