minor cleanup / rename