refactoring & modify