Movegen a bit neater