Rwanda bill 'could be so much better' - former Immigration Minister