Better naming
A few comments