Improve efficiency (28/48)

Improve efficiency