Improve efficiency (7/48)

Improve efficiency