Modify code to elimiate Hound warnings