more touchups and code cleanup
additional cleanup and reran Lint and Tidy on all 3 codes. came back 100%
Final push for tonight