Refactoring; More logical method placement.