Clean code

Improve performance