Promotion + Cleaning Up HH Code