Little bit of optimization