small refactor

Small code refactor