small fix
refactoring...