Some cleanup, #25