Re-order to improve readability