Minor comment fixes and style changes
Added code comments