Format the code and adding trace statement
Improvements benchmark script