More cleanup / formatting