Just a bit of optimization