some last minute formatting to fit our macro naming convention, before I forget