+ comments & small style tweaks