Little be of refactoring (DRY)