code refactoring
code refactoring (update arranger code)