Tiny bit of optimization