Improve efficiency (48/48)

Improve efficiency