small fix/refactoring