refactorings, mostly method signatures adjustments