Some changes

I think language in general more consistent and clean :)