Some improvements ;)

Let me know what you think.