Improve efficiency (20/48)

Improve efficiency