More optimization

Thanks to nocast