Improve efficiency
Cleaner & more efficient