Did a little code clean-up and house keeping

I know you hate clean up PRs, but......