Use new Pyeval() function
Minor refactoring