Some thinking and some cleanup