Some cleanup from playing around