series of very small refactorings, mostly following code inspection
series of very small refactorings, mostly following code inspection
corrected a refactoring