Better naming, 

Better naming, @habib comments