Ok, I tried to improve it :) Commit amended, added below.