Here are some improvements : p