Performance test and better style