Some improvements

What do you think?