Tidy up payments controller