[m2044] Blank line cleanup and other minor changes