experimentation and some cleanup.