small refactor
Small refactor again.