minor clean up 040
114, 116, 172