style
hopefully fix some more exceptions