More clean up. Also, what was I thinking?! Jeez. Part of the work on #38