More cleanup / restructuring