Refactoring for keeping simply