refactoring
minor fix