little less verbose logging and some comments cleanup