Improve efficiency (25/48)

Improve efficiency