Re-ordered stuff in payments controller