Refactoring 04 minor changes adjust method