Improve efficiency (47/48)

Improve efficiency