Chenge kwargs to don't violate one definition rule
Small refactoring