small refactor
Code refactoring