Cleanup Time

Just taking care of a few odds and ends. And no Thompson, I'm not calling you odd...