Apply method refactor properly.