some cleanup / fix