little bit of optimization