commenting improvements and cleanup