Improve efficiency (31/48)

Improve efficiency