Finalizing my cleanup from yesterday's work
A little more cleanup