A little bit of optimization