made changes to fix for code comments