[refactoring] fixed issues