Playing around and cleaning things up.