dev/fend-1029 slight cleanup