Actually, wasn't used everywhre. Updated code per review comment.