some changes
fixed refactoring error