code refactoring...
 - minor...