Indentation and comment tweaks