Little changes

Also the code is more readable