Refactoring eijiro