cleaned up checkout