some cleanup / documentation improvement