Tidy up checkout controller