Improve efficiency (40/48)

Improve efficiency