minor changes / cleanup / comments