Small optimalizations