Refactoring~!