uyjhguy
apply small refactoring