Improve efficiency (27/48)

Improve efficiency