Major cleanup of code today.