More cleanup / comments