slight cleanup / fix