Updates based on code inspections
Fixed issue