clean code and update latest performance test