! minor cleanup / formatting