Minor "improvements" #2 :-)