Refactoring Vol.2