Minor tweaks as suggested by Shadi