Few optimizes

Few optimizes