comments and spacing tweaks