formatting and comment tweaks