Performance Updates

Few small changes for performance