Lite cleanup. Next time for some data structures?