Re-order a method for readability