Reorganized a method (does the same thing)