Better naming
Simplify and improve the performance