Code clean && refactoring [2]