make minor refactorings in the green