remove array segment and improve performance
fix formatting on Performance tests