header cleanup and meter logic comments